[XEN] Use cpumask macros to update numa node masks.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 23255eb7697fd905fcfb0cf66a4cfe12d1d8770f..386234fd4721fdeaf84276ce9629157a89ac9a68 100644 (file)
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -214,7 +214,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
 
 __cpuinit void numa_add_cpu(int cpu)
 {
-       set_bit(cpu, node_to_cpumask[cpu_to_node(cpu)].bits);
+       cpu_set(cpu, node_to_cpumask[cpu_to_node(cpu)]);
 } 
 
 void __cpuinit numa_set_node(int cpu, int node)

diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h
index 3b52f28b5fd42ebb290b8b010acbc502870b6b0b..ee150953bfab36882e8c93157830c238cbf1a547 100644 (file)
--- a/xen/include/asm-x86/numa.h
+++ b/xen/include/asm-x86/numa.h
@@ -37,7 +37,7 @@ extern void __init init_cpu_to_node(void);
 
 static inline void clear_node_cpumask(int cpu)
 {
-       clear_bit(cpu, node_to_cpumask[cpu_to_node(cpu)].bits);
+       cpu_clear(cpu, node_to_cpumask[cpu_to_node(cpu)]);
 }
 
 /* Simple perfect hash to map physical addresses to node numbers */